Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 19 Mar 2010 12:16:57 +0000 (12:16 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 19 Mar 2010 12:16:57 +0000 (12:16 +0000)

Trivial merge